Repository navigation
[C++] Bound OTF var data against the remaining buffer so a uint64 length cannot wrap the index - #1180
Open
slachiewicz wants to merge 1 commit into
Open
slachiewicz wants to merge 1 commit into
slachiewicz wants to merge 1 commit into
Conversation
…gth cannot wrap the index. decodeData compares dataLength with length - bufferIndex, which cannot wrap, rather than bufferIndex + dataLength, which does for a uint64 length. Do not go back to the addition.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
decodeData checked bufferIndex + dataLength > length, which wraps for a uint64 var data length, so onVarData received a length of 2^64-1 at the end of the buffer and decode() returned a wrapped size.
The check is now dataLength > length - bufferIndex, which cannot wrap.
Part of #969.
Verified: OtfVarDataLengthTest fails on master (no exception, onVarData called) and passes here; sbe-tool checkstyle and test, cppbuild and cppbuild --debug-build --sanitise-build pass.